Symlink etc/COPYING and lisp/COPYING to /usr/share/common-licenses/GPL-2.

diff --git a/debian/changelog b/debian/changelog
index 1b7ec66adcfaf2b9a6f5434e2a5c414b0b62360e..882321aed1565973a0021f73a0c758b6bab5483d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,11 @@ emacs22 (22.1+1-2) unstable; urgency=low
   * Incorporate upstream fixes to Emacs manpage.  Thanks to Sven Joachim
     <sven_joachim@web.de>.(closes: #432732) [rlb]
 
- -- Rob Browning <rlb@defaultvalue.org>  Tue, 21 Aug 2007 21:36:19 -0700
+  * Symlink etc/COPYING and lisp/COPYING to
+    /usr/share/common-licenses/GPL-2.  Thanks to Milan Zamazal
+    <pdm@debian.org> for the report.  (closes: #436810) [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 21 Aug 2007 22:29:09 -0700
 
 emacs22 (22.1+1-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index be33eb1be14ad7969f0800ffbd865785c991c0fb..9d78b47570cf6f74687e8a1f36c1b4b6a6da6eec 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -708,12 +708,14 @@ install: debian/stamp/build $(autogen_install_files)
        perl -pi -e "s|man1/etags\\.1|man1/etags\\.1$(flavor)|" \
          $(pkgdir_common)/usr/share/man/man1/ctags.1$(flavor)
 
-        # Remove extra license files
+        # At least etc/COPYING is needed by M-x describe-copying.
        rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING
        rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/lisp/COPYING
-
-       dh_link -p$(flavor)-common \
-         usr/share/emacs/$(runtime_ver)/etc usr/share/doc/$(flavor)-common/etc
+       diff -q COPYING /usr/share/common-licenses/GPL-2
+       dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-2 \
+         usr/share/emacs/$(runtime_ver)/etc/COPYING
+       dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-2 \
+         usr/share/emacs/$(runtime_ver)/lisp/COPYING
 
         # Install replacements for non-free files that can be reached
         # through C-h